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