Sync'd branch integration/b2g-inbound with upstream @ Tue Sep  9 07:33:38 PDT 2014