merge with upstream diamond

at git://github.com/BrightcoveOS/Diamond.git