Sync'd branch integration/b2g-inbound with upstream @ Tue Aug 26 02:53:36 PDT 2014