bbondy merged 1 commit into master from block-flash-click Jan 19, 2017