Sync'd branch integration/b2g-inbound with upstream @ Tue Oct  7 11:33:43 PDT 2014