Sync'd branch integration/b2g-inbound with upstream @ Mon Sep  8 16:08:35 PDT 2014