Sync'd branch integration/b2g-inbound with upstream @ Sun Aug 31 18:11:26 PDT 2014