Sync'd branch integration/b2g-inbound with upstream @ Tue Aug 26 19:39:47 PDT 2014