Sync'd branch integration/b2g-inbound with upstream @ Wed Aug 27 01:33:25 PDT 2014