Sync'd branch integration/b2g-inbound with upstream @ Wed Aug 27 11:48:37 PDT 2014