Sync'd branch integration/b2g-inbound with upstream @ Wed Aug 27 02:03:35 PDT 2014