Sync'd branch integration/b2g-inbound with upstream @ Tue Sep  2 21:54:36 PDT 2014