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