Sync'd branch integration/b2g-inbound with upstream @ Tue Sep  2 19:48:29 PDT 2014