Sync'd branch integration/b2g-inbound with upstream @ Wed Aug 27 21:21:34 PDT 2014