Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 24 01:08:44 PDT 2014